Validation works; need type cleanup