Spaces cleanup (via CodeMain auto-clean-up on save) thx XhmikosR :)