minor syntax improvements and comment fixes