cleanup and lint