Small cleanup
Some code style changes
Some code style changes
Fall-back to drawable
Test if uri contains '/'
No need to call super