Code restructuration succesful