Code improved a little bit.