Some code/text cleanup