cosmetics & readability fixes