Some simple cleaning up of code...