Refactored message form