code clean + upped dependencies