Code review cleanup