Cleaned up Energy Machine class