Cleanup
Update comments
Add license