(RMenu XUI) Cleanups + indenting