Revert "#396 - Style enhancements"

This reverts commit 77bd07406a1314d4253ab812ab06a41da94107b3.