minor cleanup from josh