Minimize reference use
Fix indentation