Started code-cleanup by starting to add comments