Refactoring
Bug fixes