Changed some attributes that were unnecessarily static