Fixes & format changes from pull request comments