Bugfix
Refactor cleanup