Simplified if statements
Spacing...