- Fix code style issues
- Fix invalid service dependency