start cleaning up code. adds more tests