Clean up target initializer, move stuff to field