Bind global variables closer to their usage
Remove some unnecessary line breaks