More code cleaning and + added some spaces