Updates.
Remove namespace.
Accidentally added this; already in Application.
Whitespace changes.
Add/update tests.