Removed unnecessary comments and function