code style fixed. 3rd try