Improved code style: less hardcode.