Cleaned up some basic function calls.