Code cleaning+ortho