Code Cleanup: Moar DRY!