cleanup, notepad++-inspired var. renaming