White spaces fix, Tab & Indent set to 4, tiny model fixes