Issue #223 remove unneeded spaces
Issue #223 follow conventions