Some refactoring since to Reddit comments