Tidyups
Big refactor