code quality fixes and lookups schema syntax fix
Merge pull request #206 from nla/sc-schema-fix

code quality fixes and lookups schema syntax fix