Adding proper naming conventions and removing unneeded code.