Code review feedback :)