Fixed formatting errors and added dependency fixes