not sure about these changes, i think i just cleaned up code