Minor cleanup of the install code