cleanup and response to PR review