minor changes and code deletions