* Organization : small changes for style