Documentation update
Minor refactor, less code