removed unnecessary comments and code