FALCON-646 Refactoring, documentation stuff. Contributed by Paul Isaychuk