Refactor, remove Estonian comments