commented out orderby until fixed plus minor style adjustment