Some minor code cleaning