finished cleanup mostly. still need to go back and comment.