Adding assert and validate methods to reduce error handling code
Fixing minor typo and rewording a few names