Cleaned up built-in functions