Done a cleanup and small correctings