refactored and got rid of those nasty warnings

no warning!
no errors!
no nothing! except code