Refactoring
Fixes