cleanup and comments for later