Minor indentation, syntactic fixes