More code optimization