Created by: masterleinad
Running clang-tidy really didn't yield much, but this still looks nicer.
clang-tidy