Just refactoring, tidying up, doccing