Reduced extraneous code