Fixes to code indentation and other random code cleanup