simplified code redundancy
Merge branch 'cnake'