Closes #136
Several style tweaks attempting to solve Mantis issue 131, but yet far from the desired result.