Can you remove the redundant returns please?