Made implementation adhere to DRY.