clean up constructor a bit