Changed name of Component .comment by .Comment and clean code