More tweaking, less duplicated code...