Documentation and readability fixes