Reduced size of application from 19.1MB to 10.1 MB