Some more code optimization.