got code cleaned up