Cleanup source code #2