Follow code convention in controllers
Merge pull request #52 from varya/features/minor-code-convention-changes

Follow code convention in controllers