Tuple Fu, reformatting / cleanup