more refactoring and deleted default values and debug for deployment