Clean up bypass logic
Some comment updates