fix mistake
Changed structs where necessary
fix line length