code style is consistent now, no real changes