Address review + add enum's name to toString()