More type validate
Fix style
Auto close