major code cleanup part dos
fixed emacs ignoring