super duper minor nit: return not needed here, and in L233