Improve code quality

Refactor all the things!!!