Added dependencies, cleaned up code
Cleaned up code