Add comments
Improve tests
Remove vim modelines