More indentation cleanup