Code review comments implemented