Improve pre and code