Update on Code conventions. Now v1.1