Format code
pullrequest 206