Cleanup, adding value object, readme