Cleaner code that may build on VS 2010.