Spring cleaning: refactoring my really old repos
More spring cleaning