Clean up constructor style to be more consistent