Code clearning up
Merge branch 'develop' into route