Cleaned some
Removed error