Some code cleanup...