Add missing return.
Break code up in several files.