[Code] More code cleanup and declaring of variables.