Did some changes in indenting etc.