Small fix and code style