Cleanup.
Cleaned up code.
Removed redundant checks.