Removed some comments and printing