Added some comments + Renamed some methods