Changed formatting on switch (OCD)