More cleanup according to @thecodejunkie