Cleanup of if brackets on PilotScreen