Cleaned the capturing in includes, moving them to including the setup