* Some major code cleanup