Removing some comments and updating constants