Fixed decodng issue, cleaned up.