Reposition of code to add clarity