issue24: fix style

This pull request includes space related style fixes.