context: there is not need to use gotos
More cleanup