Added cleaned up scaffold
Validation!