Refactors: new coding convention