some small fixes and beautifications
Merge branch 'master' of github.com:jeron-diovis/dive-into-backbone