Refactoring: Minor clean up on Domain POCO's