Minor improvments
Removed some ugly blank spaces