Still cleaning source code