make it worked & cleanup