commented and cleaned up Bond code