More clean code with teacup and bubblewrap