Small corrections
Code readability fixes