Improved Structure

Removed a few errors