Improved source code