#10: Additional code cleanup