Implement code changes to enhance functionality and improve performance 25ba4f3 ethix commited on Jul 26