General Cleanup

Cleaned code up. Removed testing code.