muflone Code cleanup