Spacing restored, refactoring
- Several constants and functions moved.
Authored by: aaku 2014-02-02
Parent: [r979]
Child: [r981]