Move and refactor code