Major cleanup after initial LINT run
Major cleanup after LINT run