Formatting + Checkstlyes on extensions src.  Still need to do tests.