Little cleanups... everything isn't the greatest but...