Change more naming conventions and added comments