code cleanup and lint removal