Refactoring
Bug fix