Better code separation