Clean up code some more...