Minor refactors on line.