Code cleanup and variable tweaks