Cleansed code with new skeleton classes