Refactored usage

usage was buggy