Changes suggested by resharper