Cleanning up code...