Fix indentation, inconsistencies and grammatical inelegances