core project formatting to conform to checkstyle.  Still need to do test...

...s.