If-else formatting cleanup , no functional changes