Updating comments and code readability