More code cleanup. DRY, guys, DRY'