Changed function names to be more descriptive
Removed unnecessary comments