Cleanup

Removing null tests from setters, replacing if's with Ternary Operators, adding spaces within tests.