[Testing] Code cleanup, minor indents & Subtitle menu show selection