Small cleaning of code..