Small refactor for standarization