Removed some copy/paste anomalies