Small fix and more cleanup