Bugfix

All kinds of tidying up
extra space