more code cleaning
Hats!