Refactoring
Small bugfix