Stylistic changes - moved issue in front of test