simple cleanup and variable renaming