- fix and cleanup