Added constructor cleanup changes back in.