furthur clean up code