CodeMaid + Resharper cleanup.