Clean up, avoid unneeded construction