Fix style
Fix leave/exit bug