Basic refactor
Small refactor