Cleaned

Cleaned up, ready to begin coding up