moved some things, removed some spacing