Code refactoring
Documentation