Minor code cleanup for greater consistency