Re-design source code