fixed up the structure some