Cleaned up coding style.