Cleaned up some more spacing and function calls.