Small refactor and change encoding.