Fixes and cleanup based on pull request feedback