cleanup and comments
cleanup