move things around a little
style updates