/cc @jamtur01 
How should it be here?
Follow harder to read convention or start amending?