working on cleaning up shit