More code reduction