Added more of Dan's suggestions
Removed extraneous comment