Cleanup

Removed unneeded data and spaced code out some.