More refactorings - streamlined some things.