Minor function simplification