more fix and clean.