[Parser] Cleaned up code