CLEANUP: Fixed if statements for compiler
CLEANUP: Fixed if statements in rest of files
CLEANUP: Added missing semicolons