simplyfy the project code
Merge branch 'simplyfy1'
Project codes are simplified