Some more refactorin'