Minor: Cleanup