Aligning our styleguide with currnet practices

Closes #14 
@carlallen