Slightly improved code style