streamlined code+ comments