+ Remove some duplicated code.