cleanup, added commentary, updated custom validation
cleanup, added commentary, updated custom validation