Fixed indentation and better security