More code cleanup for clarity