cleaned up code, spacing