REFACTOR: Minor code cleanup