Apply the code review comments