Clean up constructor code