Fixed Syntax errors, Fixed Naming convention, and added comments