Minor refactoring, hah.