Cleaned up client code to be flatter