Cleaned up, updated deps