Minor tweaks, indentation issues
3 files changed