Finished all the works except comments abstraction