Inn refactoring