#2 Some code cleanup...