refactor + tidy up