General readability and performance updates