Refatoring source code...