Add missing semicolons
Remove redundant extra logical operator
Add braces for if statements
Add space to improve readability
Merge pull request #62 from joaostein/refactor

Code Review