Refactor/clean up every thing