Code org

Some silly style tweaks, too