Clean up structs and extra info in client

This is also a demonstration of commits.