Fixed the comments/issues, white spaces, indentation; except for the Database calls that is made in the renderer