need to clean code