Fixed spacing issues
Fixed merge conflict
Removed old code
Merge pull request #180 from ZAM-/master

Fixed spacing, removed old code