Renaming
Added comments
Organised code