Refactoring some DRY stuff