Updates class cleaned up & refactored.