Improve readability. #29