Pruned unnecessary imports.
Cleaned up naming conventions.