Further indentation cleanup