Cleanup and lint