Improved code syntax