Removed Un-Necessary Commented Codes and Functions