revised some comments and indentation
refactor normal mode commands for vim
delete trailing whitespace
rename normal mode variable
revise macro