Refactor conditional statements (ie. if (abc == true) to if (abc)) and f...

...ormatting