Resolve issue #2136
style minor changes
Merge pull request #2232 from pinkfloyda/issue2136

Fix #2136 + Some fixups