Simplify baseline code