Restructured class Comment to use the constructor instead of setters as much as possible