DRY, Code Cleanup