Code cleanup: adds missing brackets in single line if statments