Slight cleanup, no major changes