review comments and cleanup