Applied changes from code review comments