Clean up field initializer, move stuff to field value