More whitespace and formating cleanup. 100 column convention for now