Updated conventions to match my preferences