Fixed intendations and included other changes.