Code refactoring
Documentation updates