refactorama
fix it