corrected some indentation and removed personal views