Small fix + white spaces