Cleanup effort to bring everything in-line with good XNA practices