Just some code cleaning