nit picky updates, not major logic refactoring yet