Initial Changes

First Cleanup and changes