Moved initial values out constructor onto properties