ashwin / Anishek | # 1638 | Moved answer formatting logic to the fields