Code review, small changes