ref #1444 minor changes and cleanup