Fixes, Refactoring