indentation n other minor changes