Some more changes/ refractoring