Small fix cleanup