Refractor comment object

Refractored and commented.

Done.