Made few simple changes to structure