More indentation improvements along with removing a space after type cast.