some light cleanup