Commenting

Updated comments and removed auto generated code.