A few more formatting corrections and clarification
Naming correction
minor fixes