removed more explicit typing where it doesnt matter