cleanup & resolved #7