Code cleanup. Added domain object builder.