Some more refctoring