Some refactorin'