More space removal
Added 'usable' boilerplate stuff