clenup and fix