master: refactored usage