Some more code cleaning