refactoring

for fun