some additional clean up