I've modified the code in order to be compliant with this convention