Yosemite; Some OCD cleanup