Refactor + polish letters