Finished refactor

unless more stuff pops up