* performance and readability changes