Cleaned up muddled syntax

Mostly stylistic fixes