Cleaning up code because keep getting false