Source code cleaned