Removed special characters in comments
WIP on domain model