Improved source code of application