more refactoring

seems mostly harmless^Wstable