Refactor pretty much done