Seperate some code