Refactor
Bug fix