Added constructor and comments not as a block