cleaned up "parsing"