Making code-conventions changes (cleaning up the way the code looks, now that uglification is streamlined and I'm moving to add tests)

Signed-off-by: Shane Gadsby <schme16@gmail.com>