comment and clean up for reference