UPDATE add unPrefix option to cli and clean the code a bit