Cleanup and improve performance.
Remove unnnecessary return.
Update minified file.