rollback some modifications to keep code clear