removed guff and cleaned up