Separate code some more