Restructured a bit