Documentation + code style update

This is a follow-up for Pull Request #7 (part 2 of 2)