Some style fixes.
Redesigned creator parameters