Fix Apache-2, add authentication keyword
Style tweaks for consistency