Multiple minor cleanups and removal of local variables from some methosd