Some light cleanup.