Cleaned function names