readability and logic fixes