Refactoring + Bugfixing