Rearranged layout slightly to accommodate execution on Mac OS X