Remove unused code
Add missing line-feed at EOF
Correct order of constants
Remove obsolete parentheses
Code cleanups