General code cleanup.

Code cleanup and erased some print lines.