Code cleanup and lint fix.