More code simplifications