#16 - refactor for code readability. Improve Main Dependencies lookup. Add test for missing dependency state.