tweaked code style