Removed some of the legacy logic that was here. Clarified some expressions