Refactor

- Some refactors