Small fix and cleanup