cleaned up code before first pull