added validation; formatting