Chipping away at the codebase