code quality fixes and lookups schema syntax fix