! Renamed some variables
! Formatted queries
! Fixed regex issue with parser

Signed-off-by: Jason Clemons <jason@xboxleaders.com>