Code Refactor!
Fixing code so it fits the code standard.