Code review and small changes