Refactoring
Post-refactoring fixes