fixed comments and code style