Further refactoring, and cleaning up of method parameters