going to get minor updates
merged whitespace changes