Improve class readableness