Minor refactoring

Did not delete the original code in case we want to change the way we
implement this issue...