Added empty returns where the code is not supposed to return anything