Removed unnecessary comments and codes