Improve source code