Small refactor + linear