Refactor/coding