More code cleanup..