Namespace cleanup
Collision reduction

Reducing collision between forms/polls.
Style cleanup