Tweaked code style