Fixed some syntax style that I felt should be enforced to avoid bugs