Issue #184 Code Review Comment Fixes And Formatting Issue Fix