cleaning up code, removing spaces