Tweaking code style