Restructures more code...