Cleaned up builtin library functions