Fix issue #28
Remove unnecessary white spaces/code cleanup