bug fix and clean