Small updates

Organization, reformulation and orthograph