Fix indents and copy behavior