Simplifying Code
Merge branch 'dev'