Improved code style