Removed the comments and created new constants