More cleanup for code climate.