Needs some cleanup
cleanup