Follow Fork coding standards

There are some more places with wrongly placed else or elseif statements. More info can be found here: https://github.com/forkcms/coding-standards
Merge pull request #2 from WouterSioen/patch-1

Follow Fork coding standards.