Fixing some code formating. This closes issue #30