Applied comments.
Applied most of design comments.