Recommended programming style enforced (fewer spaces).

According to some, too many whitespaces after opening brackets are not
good, so I removed them.
Merge branch 'cleanups' into develop

Merge commit
Used "final" for reference parameters in methods.

Wherever possible and useful, added "final" to input parameters which
are references.
Merge branch 'CorrectedConstantHandling' into develop