Clean up guard file
DRY up the client