Code cleanup and lint warning removal.