Fixed formatting and updated bestpractices
Merge branch 'bestpractices'