refactor

I still try to learn this project so I keep doing some refactoring.