Clean up code

Code now has consistent styling and syntax throughout app