Refactor/code cleanup