Cleaned up syntax from bracket style and moved single line comments inline