FALCON-610 Refactoring and documentation updates. Contributed by Paul Isaychuk