some changing of comments and code formatting