Cleanup in code. ReSharper up in here...