Cleaned up code
Merge branch 'dev'