Coding style has been cleaned up.