Tweaking code formatting