more styling, reorganazation