implemented #82 and cleaned the default fields