fixed a few style issues; fix and implement value object trait in two cases