clear up to improve code quality