cleanup
updated helper
added validation getter
refactoring
fixed import