a little formatting and cleanup