Tidy up code, remove unnecessary Struct