Clean up constructor style to more consistent