Revert "Coding conventions 5"
Merge pull request #37 from Wikia/revert-34-coding-conventions-5

Revert "Coding conventions 5"