Refactor

Cleanup a bit