Minor refactoring
Update docs