Cleanup of comments and terminology