Small simplification / optimization