Improved performance
Formatted code
Updated change log