Changed struct pointer notation to shortcut notation