cleaned up code, removed spaces