- refactored code
- fixe bugs