Restructured + style updates