Just some reformatting - way too many comments here!