cleanup and smaller generated file size