Initial
Small refactoring