Left behind comits. Lint Fixes.