Minor fix to the formatting.
Fixed the formatting options so that the if in else if doesn't go on it's own line, and also updated the naming conventions to reflect what's actually used.
Merge pull request #47 from Orvid/master

Formatting