removed obsolet code
fixed issue with goto