Split code up a little
Split code up a little