Code cleaning (Move source code)