small changes
Small refactoring