General cleanup to satisfy my OCD a little while longer.