made small changes to structure