Cleaned ComandHandler