Litlle refactors to add legibility & comprehesion