minor - reformatting and stream-lining code. 
1 file changed