some cleanups and menu-mergin for spaced style
add code-comments