Improvements after a code review