Fixing #domain
Cleaning up #domain