Minor changes + cleanup.