Partial Code Refactor

Partial Code Refactor: lint the code
Changelog update