removed unnecessary comments and improved others