Finish implementing comment parser