Addressing feedback, more cleanup