Cleanup and added some deps