refactor cleanerd structure