Removing unnecessary comments and printf's
Fixed merge conflicts