Refactor/fixed: syntax errors, improper indenting, missing semicolons, and extra white space