Slightly cleaned up 'pass'es