Code cleanup!! =D