Cleaner code. Improved documentation.