Solve cyclic references

return on separate line here and other places.