Further refactoring to take advantage of XNA architecture