Cleanup. Adding default params by switching to type.