Organized code better (parser is internal to database now)