Updated per PR comments and suggestions