Reflected changes in the Content class
Code cleanup