Some optimizations to reduce file size