Added files
Cleanup and more comments