C# is odd about if/else it seems. Also small indent cleanup.