Refactoring to update older methods
Further refactoring - finally reduced method sizes down to a more manageable and consicely descriptive level.