Removed some uneccesary comments and codes for debugging