cleaned up parsing angular form & json