Constructor clean up