small updates to remove comments and clean up code