Start refactoring code...