Separated code some more.