More code simplification