Cleanup (re type function parsing)