Cleaning + adding check for IP