Formatting

Inline conditional statements not allowed, yoda conditions, spacing