Cleaning up, making sure things follow convention
Merge branch 'feature/Convention' into develop