Refactor/cleanup