comments and readability changes