cleanup. fixed weird bug