Remove code duplication, minor improvement