Small fix and code format