Refactor, use Intent.getAction() instead of extras (like in other places). Formatting.