some more clean and fix