Added end-of-line comment support, did internal cleanup