Minor changes, removed some spaces