Fix issue1
Fix #1 and code style