Refactoring
Bugfix