Code improvements suggested during code review