Code clean up - Go Resharper!