cleanup, back to good old spaces.. I hope this doesn't make too much
mess