Minor refactor; Updates the documentation