Minor cleanup
Still needed to declare the types for the tuples that are being passed around