Documentation
Minor refactor