Updated: documentation
Changed: some code cleanup