code cleaned out