Some cleanup regarding returns