Quick clean-up and resolving some syntax errors created by my formatter

GRRRRRRRRR