Added comments plus constructor