Minor changes

Clarifications, very small optimizations, better indentation, etc