Improving comments and removing prints