Writing readable code
Bug fix: incorrect elements order in a structure