Refactor Method to uppercase, other consistencies.