Cosmetic edits

- Added more constants in place of hardcoded values
- Now using brackets on the same line, for readability
- Comments are now in english