cleaning up good, style, renamed a var that matched a builtin