The duplicated code should be pulled up to a shared source, other than that +1