Tweaked quick_pass for cleanliness, modularity