A littler cleanup