Added some stictness.
Cleanup.