Some more indentation and misc fixes