1. Refactor codes  2. Change style