refactoring

sorry I couldn't resist