Cleaned up parsers