Conforming to some better standards (hopefully)