trait: refactor and define magic number
changed name of current trait to this in constructors/destructors