Minor changes (clarifications, very small optimizations, better indentation, etc)