Polish and small refactoring