Made changes to naming and added comments