Fixing tabs, changing where statements