Cleaned up Cappy::block