Simpliying a few things