Hotfix + code formatting.