Misc code cleaning