Since I've touched almost every line in here, white space cleanup.