minor reformatting and cleanup