Formatting + removed context info in Class.