Cleaned up parsing variables