Some more refactor