Remove policy markers for now
Correct indentation
Remove some lines
Fix values, activity status
Remove newline
Remove some duplication
Tidy up a bit