Removed comments, cleaned up indenting.