Design improvement on comments