codereview cleanup