Refactor message methods