Finishes refactoring and reflection