Removed mess and sorted indenting.