whoa what's up with all the mad spacing changes in this file? makes it hard to figure out what you actually added/changed. can you fix it so the diff is better?